Skip to content

esm: handle more error types thrown from the loader thread#48247

Merged
nodejs-github-bot merged 1 commit intonodejs:mainfrom
aduh95:loader-throw-funny
Jun 1, 2023
Merged

esm: handle more error types thrown from the loader thread#48247
nodejs-github-bot merged 1 commit intonodejs:mainfrom
aduh95:loader-throw-funny

Conversation

@aduh95
Copy link
Contributor

@aduh95 aduh95 commented May 30, 2023 •
edited
Loading

Refs: #48240

@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented May 30, 2023

Review requested:

  • @nodejs/loaders
  • @nodejs/modules

@nodejs-github-bot nodejs-github-bot added esm Issues and PRs related to the ECMAScript Modules implementation. needs-ci PRs that need a full CI run. labels May 30, 2023
ljharb
ljharb reviewed May 30, 2023
View reviewed changes
@aduh95 aduh95 added author ready PRs that have at least one approval, no pending requests for changes, and a CI started. request-ci Add this label to start a Jenkins CI on a PR. labels May 31, 2023
@github-actions github-actions bot removed the request-ci Add this label to start a Jenkins CI on a PR. label May 31, 2023
@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented May 31, 2023

CI: https://ci.nodejs.org/job/node-test-pull-request/52019/

JakobJingleheimer
JakobJingleheimer approved these changes May 31, 2023
View reviewed changes
Copy link
Member

@JakobJingleheimer JakobJingleheimer left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome, thanks!

The new test-cases seem a bit verbose; could they be DRY'd up with a loop (for (const valid of […]) and possibly for (const invalid of […]))?

lib/internal/modules/esm/worker.js
Comment on lines +51 to +54
if (status === 'success' || body === null ||
(typeof body !== 'object' &&
typeof body !== 'function' &&
typeof body !== 'symbol')) {
Copy link
Member

@JakobJingleheimer JakobJingleheimer May 31, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit

Suggested change
if (status === 'success' || body === null ||
(typeof body !== 'object' &&
typeof body !== 'function' &&
typeof body !== 'symbol')) {
if (status === 'success' || body === null ||
(typeof body !== 'object' &&
typeof body !== 'function' &&
typeof body !== 'symbol')
) {

@aduh95
Copy link
Contributor Author

aduh95 commented May 31, 2023

The new test-cases seem a bit verbose; could they be DRY'd up with a loop (for (const valid of […]) and possibly for (const invalid of […]))?

There are on the same structure than almost every other test cases in that file, that seems fine to me. IMO test code should be WET code, not DRY.

@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented May 31, 2023

CI: https://ci.nodejs.org/job/node-test-pull-request/52026/

@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented May 31, 2023

CI: https://ci.nodejs.org/job/node-test-pull-request/52032/

@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented May 31, 2023

CI: https://ci.nodejs.org/job/node-test-pull-request/52033/

@aduh95 aduh95 added the commit-queue Add this label to land a pull request using GitHub Actions. label Jun 1, 2023
@nodejs-github-bot nodejs-github-bot removed the commit-queue Add this label to land a pull request using GitHub Actions. label Jun 1, 2023
@nodejs-github-bot nodejs-github-bot merged commit d28f1f1 into nodejs:main Jun 1, 2023
@nodejs-github-bot
Copy link
Collaborator

nodejs-github-bot commented Jun 1, 2023

Landed in d28f1f1

@aduh95 aduh95 deleted the loader-throw-funny branch June 1, 2023 10:08
This was referenced Jun 2, 2023
Open
Open
Open
targos pushed a commit that referenced this pull request Jun 4, 2023
@aduh95 @targos
esm: handle more error types thrown from the loader thread
3c7846d 
PR-URL: #48247
Refs: #48240
Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Jacob Smith <jacob@frende.me>
@targos targos mentioned this pull request Jun 4, 2023
Merged
This was referenced Jun 5, 2023
Open
Open
franciszek-koltuniuk-red pushed a commit to franciszek-koltuniuk-red/node that referenced this pull request Jun 7, 2023
@aduh95 @franciszek-koltuniuk-red
esm: handle more error types thrown from the loader thread
9421c52 
PR-URL: nodejs#48247
Refs: nodejs#48240
Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Jacob Smith <jacob@frende.me>
@danielleadams
Copy link
Contributor

danielleadams commented Jul 6, 2023

This is blocked by another PR that needs to be backported to v18.x because it references missing code.

@aduh95
Copy link
Contributor Author

aduh95 commented Jul 9, 2023

For reference, backporting this is blocked until #44710 is backported.

Ceres6 pushed a commit to Ceres6/node that referenced this pull request Aug 14, 2023
@aduh95 @Ceres6
esm: handle more error types thrown from the loader thread
215acb4 
PR-URL: nodejs#48247
Refs: nodejs#48240
Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Jacob Smith <jacob@frende.me>
Ceres6 pushed a commit to Ceres6/node that referenced this pull request Aug 14, 2023
@aduh95 @Ceres6
esm: handle more error types thrown from the loader thread
f1e94fd 
PR-URL: nodejs#48247
Refs: nodejs#48240
Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Jacob Smith <jacob@frende.me>
targos pushed a commit to targos/node that referenced this pull request Nov 11, 2023
@aduh95 @targos
esm: handle more error types thrown from the loader thread
2bb6dfb 
PR-URL: nodejs#48247
Refs: nodejs#48240
Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Jacob Smith <jacob@frende.me>
@targos targos mentioned this pull request Nov 11, 2023
Closed
targos pushed a commit that referenced this pull request Nov 23, 2023
@aduh95 @targos
esm: handle more error types thrown from the loader thread
9938a8b 
PR-URL: #48247
Backport-PR-URL: #50669
Refs: #48240
Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Jacob Smith <jacob@frende.me>
@targos targos mentioned this pull request Nov 28, 2023
Merged
sercher added a commit to sercher/graaljs that referenced this pull request Apr 25, 2024
@sercher
esm: handle more error types thrown from the loader thread
d5f0a76 
PR-URL: nodejs/node#48247
Backport-PR-URL: nodejs/node#50669
Refs: nodejs/node#48240
Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Jacob Smith <jacob@frende.me>
sercher added a commit to sercher/graaljs that referenced this pull request Apr 25, 2024
@sercher
esm: handle more error types thrown from the loader thread
02041f8 
PR-URL: nodejs/node#48247
Backport-PR-URL: nodejs/node#50669
Refs: nodejs/node#48240
Reviewed-By: Geoffrey Booth <webadmin@geoffreybooth.com>
Reviewed-By: Moshe Atlow <moshe@atlow.co.il>
Reviewed-By: Jacob Smith <jacob@frende.me>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@ljharb ljharb ljharb left review comments

@GeoffreyBooth GeoffreyBooth GeoffreyBooth approved these changes

@JakobJingleheimer JakobJingleheimer JakobJingleheimer approved these changes

@MoLow MoLow MoLow approved these changes

Assignees

No one assigned

Labels

author ready PRs that have at least one approval, no pending requests for changes, and a CI started. esm Issues and PRs related to the ECMAScript Modules implementation. needs-ci PRs that need a full CI run.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

8 participants

@aduh95 @nodejs-github-bot @danielleadams @ljharb @GeoffreyBooth @JakobJingleheimer @MoLow @targos